Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
authorIan Campbell <ian.campbell@citrix.com>
Mon, 22 Apr 2013 11:59:26 +0000 (12:59 +0100)
committerIan Campbell <ian.campbell@citrix.com>
Mon, 22 Apr 2013 11:59:26 +0000 (12:59 +0100)
commitbeb0975bcfd49d0ddd89267af8860c520d2db251
tree15facc36339390be5d2608373393efb78d58aca6
parent592d3ef961cafda917a7f123999dc04d426254ee
parent9be8a4447103d92843fcfeaad8be42408c90e9a9
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging